Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Sat, 20 Oct 2012 11:49:12 +0000 (13:49 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sat, 20 Oct 2012 11:49:12 +0000 (13:49 +0200)
commit6d8ce4e2f80cc0d27ec464b19ae35fbdb7e2b1b3
tree33c163c8c382c06a1e5c1d64e95ea173eadcb212
parent5a2b82979df626ec2e3de7bfd2eda20435f86122
parente853dbd99a081023490d025fda0d412c62d88f85
Merge from trunk.
lib-src/ChangeLog
lib-src/makefile.w32-in
lisp/ChangeLog